src/model/cloud-runner/remote-client/index.ts (2)

213-213: Simplify async return statement.

The function is already async, so wrapping the return value in a Promise constructor is unnecessary. This can be simplified.

♻️ Suggested simplification

-    return new Promise((result) => result(``));
+    return ``;

---

309-311: Address static analysis hints for naming and formatting.

ESLint flags the variable name depthArg (should be depthArgument) and Prettier flags the line formatting.

♻️ Suggested fix

-      const depthArg = CloudRunnerOptions.cloneDepth !== '0' ? `--depth ${CloudRunnerOptions.cloneDepth}` : '';
+      const depthArgument = CloudRunnerOptions.cloneDepth !== '0' ? `--depth ${CloudRunnerOptions.cloneDepth}` : '';
       await CloudRunnerSystem.Run(
-        `git clone ${depthArg} ${CloudRunnerFolders.targetBuildRepoUrl} ${path.basename(CloudRunnerFolders.repoPathAbsolute)}`.trim(),
+        `git clone ${depthArgument} ${CloudRunnerFolders.targetBuildRepoUrl} ${path.basename(
+          CloudRunnerFolders.repoPathAbsolute,
+        )}`.trim(),
       );

src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts (3)

22-24: Remove or replace trivial test with meaningful assertion.

This test asserts true === true, which provides no validation. If the intent is to verify the file loads without errors, the import/parse step already does that. Consider removing this test or replacing it with a meaningful assertion (e.g., verifying exported functions exist).

---

72-126: Consider extracting repeated credential setup in customJob YAML.

The AWS credential configuration block is duplicated three times across test-s3-pull-cache, test-s3-upload-cache, and test-s3-upload-build steps. This increases maintenance burden and risk of inconsistency.

Consider moving credential setup to a shared initialization step or relying on environment variables passed to containers rather than repeating aws configure in each step.

---

134-135: Remove redundant shouldRunS3 check.

This code path is only reachable when shouldRunS3 is true (guarded at line 43), making the inner check redundant.

-        // Only run S3 operations if environment supports it
-        if (shouldRunS3) {
+        // Run S3 verification operations
+        {

src/model/cloud-runner/providers/aws/aws-job-stack.ts (1)

21-30: Extract getStackWaitTime() to a shared module to avoid duplication.

This function and DEFAULT_STACK_WAIT_TIME_SECONDS are duplicated identically in three files: aws-job-stack.ts, aws-base-stack.ts, and index.ts. Consider extracting them to aws-client-factory.ts or a dedicated utility module.

♻️ Example consolidation

In aws-client-factory.ts:

const DEFAULT_STACK_WAIT_TIME_SECONDS = 600;

export function getStackWaitTime(): number {
  const overrideValue = Number(process.env.CLOUD_RUNNER_AWS_STACK_WAIT_TIME ?? '');
  if (!Number.isNaN(overrideValue) && overrideValue > 0) {
    return overrideValue;
  }

  return DEFAULT_STACK_WAIT_TIME_SECONDS;
}

Then import it in the other files:

import { getStackWaitTime } from './aws-client-factory';

src/model/cloud-runner/providers/aws/index.ts (1)

105-109: Consider removing or documenting the unused factory method calls.

getECS() and getKinesis() are called but their return values are discarded. If the intent is to pre-initialize clients for early failure detection, add a comment explaining this. Otherwise, remove these calls since the factory will lazily initialize clients when actually needed.

   ResourceTracking.logAllocationSummary('aws workflow');
   await ResourceTracking.logDiskUsageSnapshot('aws workflow (host)');
-  AwsClientFactory.getECS();
   const CF = AwsClientFactory.getCloudFormation();
-  AwsClientFactory.getKinesis();

src/model/cloud-runner/providers/k8s/index.ts (2)

162-200: Test cleanup block uses dynamic import unnecessarily.

The dynamic import of CloudRunnerSystem at line 168-170 is unnecessary since CloudRunnerSystem is already imported at the module level (line 19). While past reviews marked this as addressed, the dynamic import pattern persists. Use the existing module-level import directly.

♻️ Suggested fix

       if (process.env['cloudRunnerTests'] === 'true') {
         try {
           CloudRunnerLogger.log('Cleaning up old images in k3d node before pulling new image...');
-          const { CloudRunnerSystem: CloudRunnerSystemModule } = await import(
-            '../../services/core/cloud-runner-system'
-          );

           // Aggressive cleanup: remove stopped containers and non-Unity images
           // ... rest of code using CloudRunnerSystem instead of CloudRunnerSystemModule

And update line 188:

-              await CloudRunnerSystemModule.Run(cmd, true, true);
+              await CloudRunnerSystem.Run(cmd, true, true);

---

206-282: Redundant dynamic import in image cache validation block.

Similar to the cleanup block, line 208-210 dynamically imports CloudRunnerSystem when it's already available at module scope. This adds unnecessary overhead and complexity.

♻️ Suggested fix

         if (process.env['cloudRunnerTests'] === 'true' && image.includes('unityci/editor')) {
           try {
-            const { CloudRunnerSystem: CloudRunnerSystemModule2 } = await import(
-              '../../services/core/cloud-runner-system'
-            );
-
             // Check if image is cached on agent node (where pods run)
-            const agentImageCheck = await CloudRunnerSystemModule2.Run(
+            const agentImageCheck = await CloudRunnerSystem.Run(
               `docker exec k3d-unity-builder-agent-0 sh -c "crictl images | grep -q unityci/editor && echo 'cached' || echo 'not_cached'" || echo 'not_cached'`,

Apply similar changes to all CloudRunnerSystemModule2.Run calls in this block.

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts (1)

141-170: Cleanup logic is thorough but duplicates earlier block.

The cache cleanup logic (lines 141-170) largely duplicates the workspace cleanup logic (lines 111-138). Consider extracting a shared helper function to reduce duplication.

♻️ Suggested refactor pattern

async function safeCleanupDirectory(dirPath: string, logger: typeof CloudRunnerLogger) {
  if (!fs.existsSync(dirPath)) return;
  
  try {
    logger.log(`Cleaning up: ${dirPath}`);
    await CloudRunnerSystem.Run(`chmod -R u+w ${dirPath} 2>/dev/null || true`);
    await CloudRunnerSystem.Run(`rm -rf ${dirPath} 2>/dev/null || true`);
    await CloudRunnerSystem.Run(`find ${dirPath} -type f -delete 2>/dev/null || true`);
    await CloudRunnerSystem.Run(`find ${dirPath} -type d -empty -delete 2>/dev/null || true`);
  } catch (error: any) {
    logger.log(`Failed to cleanup: ${error.message}`);
  }
}

src/model/cloud-runner/cloud-runner.ts (1)

156-168: Dynamic provider loading with fallback is acceptable but consider logging level.

The dynamic provider loading approach with fallback to LocalCloudRunner is reasonable for extensibility. However, silently falling back could mask configuration errors in production.

Consider using CloudRunnerLogger.logWarning instead of CloudRunnerLogger.log for the fallback message to make it more visible.

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts (1)

102-136: Cleanup logic duplicates the retaining test pattern.

This cleanup block is nearly identical to the one in cloud-runner-end2end-retaining.test.ts. Consider extracting a shared test utility for cache cleanup to reduce duplication across e2e tests.

src/model/cloud-runner/remote-client/index.ts (1)

397-400: Remove unconventional void 0 statement.

The void 0; statement at line 399 is unconventional for a no-op. The comment alone suffices, or use an empty block.

     } catch {
       /* no-op: best-effort git lfs pull without tokens may fail */
-      void 0;
     }

src/model/cloud-runner/providers/k8s/kubernetes-storage.ts (1)

61-75: Avoid creating redundant KubeConfig instances; reuse the initialized client's kubeconfig.

While both kubeClient and the independently created KubeConfig at line 62 use loadFromDefault() and thus load the same default cluster config, creating separate KubeConfig and StorageV1Api instances each time this method is called is inefficient and violates DRY.

Instead, add StorageV1Api to the Kubernetes class initialization (in index.ts), or pass the KubeConfig instance as a parameter to this method to reuse it. The same pattern is repeated at line 187.

src/model/cloud-runner/providers/docker/index.ts (1)

140-141: Add blank line before the comment to satisfy ESLint.

Static analysis reports a missing blank line before the comment.

🔧 Proposed fix

     const entrypointFilePath = `start.sh`;
+
     // Use #!/bin/sh for POSIX compatibility (Alpine-based images like rclone/rclone don't have bash)
     const fileContents = `#!/bin/sh